Update documentation: separate /boot should no longer be required

diff --git a/debian/changelog b/debian/changelog
index a43c2059505e48d60e2e107c2f1e70ca5ac3fd0a..d111c1b8b38cfcc17d504001da5101fb15d9530b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ostree (2020.6-1) UNRELEASED; urgency=medium
 
   * New upstream release
   * ostree-boot-examples: Update for ostree-boot being in Debian 10
+  * Update documentation: separate /boot should no longer be required
 
  -- Simon McVittie <smcv@debian.org>  Tue, 08 Sep 2020 10:55:39 +0100
 

diff --git a/debian/control b/debian/control
index 07e8f352bdaa431b0a450ea82cb17f11fb9be1d7..14c73f5a800afd69fa16a6bf844a7b1308da8bc6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -176,7 +176,6 @@ Description: libostree boot loader and initramfs integration
  integration currently has some limitations:
  .
   - the initramfs must have been made using dracut
-  - /boot must be a separate partition
   - the boot loader must be one that is supported by libostree, currently
     GNU GRUB 2, syslinux/extlinux or Das U-Boot
 

diff --git a/debian/ostree-boot-examples/README.md b/debian/ostree-boot-examples/README.md
index 38073cf9d22c7ba23a94dc76d972b7bb56856a27..50e8847d7ab40723564720e0747e9c2cc78efdc5 100644 (file)
--- a/debian/ostree-boot-examples/README.md
+++ b/debian/ostree-boot-examples/README.md
@@ -7,13 +7,14 @@ but bare metal should work equally.
 
 The installation needs to satisfy the following requirements:
 
-* It must have a separate /boot partition (this is a general libostree
-  limitation, see [ostree issue 1452][]).
 * The root partition must not be encrypted.
 * It must use GRUB and BIOS booting. Other bootloaders or EFI may require
   different bootloader setup steps; see [old Fedora instructions][]
+* If you start from Debian 10 or older, it must have a separate
+  /boot partition due to limitations in ostree 2020.5 and older.
+  If the initial installation was with ostree 2020.6 or later, this
+  is no longer required.
 
-[ostree issue 1452]: https://github.com/ostreedev/ostree/issues/1452
 [old Fedora instructions]: https://pagure.io/workstation-ostree-config/blob/5b574d39c63b82b397df789eb4a75a5bdcc13dd0/f/README-install-inside.md
 
 Using a caching apt proxy is suggested; in these examples it's

diff --git a/debian/ostree-boot.README.Debian b/debian/ostree-boot.README.Debian
index f156b6a7fc91123ce4a45de6824d8c0f7346a89f..37ff00e208d970e5a172f1cf183ab78c1e37b58f 100644 (file)
--- a/debian/ostree-boot.README.Debian
+++ b/debian/ostree-boot.README.Debian
@@ -5,6 +5,5 @@ This integration currently has some limitations:
   - the root filesystem must be one that dracut can mount without a root=
     command-line argument (an EFI partition with the GUID defined in
     the Discoverable Partitions specification[1])
-  - /boot must be a separate partition
 
 [1] https://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/